Output Makefile for the pixbuf engine directory.

Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>

        * configure.in: Output Makefile for the pixbuf engine directory.

        * gtk/gtk.symbols: Add gtk_button_{get,set}_image.

        * modules/engines/pixbuf/pixbuf-render.c: Replace usage of deprecated
        functions.

        * modules/engines/pixbuf/pixbuf-draw.c: undef GDK_DISABLE_DEPRECATED
        for gdk_draw_string (ick).

diff --git a/ChangeLog b/ChangeLog
index 086ebfeb33019e7e8c4573798bbbe5d2cfca8b51..83248c621a3885a9cf3bf9db560b21058448671f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
+
+       * configure.in: Output Makefile for the pixbuf engine directory.
+
+       * gtk/gtk.symbols: Add gtk_button_{get,set}_image.
+
+       * modules/engines/pixbuf/pixbuf-render.c: Replace usage of deprecated
+       functions.
+
+       * modules/engines/pixbuf/pixbuf-draw.c: undef GDK_DISABLE_DEPRECATED
+       for gdk_draw_string (ick).
+
 2004-11-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 086ebfeb33019e7e8c4573798bbbe5d2cfca8b51..83248c621a3885a9cf3bf9db560b21058448671f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
+
+       * configure.in: Output Makefile for the pixbuf engine directory.
+
+       * gtk/gtk.symbols: Add gtk_button_{get,set}_image.
+
+       * modules/engines/pixbuf/pixbuf-render.c: Replace usage of deprecated
+       functions.
+
+       * modules/engines/pixbuf/pixbuf-draw.c: undef GDK_DISABLE_DEPRECATED
+       for gdk_draw_string (ick).
+
 2004-11-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 086ebfeb33019e7e8c4573798bbbe5d2cfca8b51..83248c621a3885a9cf3bf9db560b21058448671f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
+
+       * configure.in: Output Makefile for the pixbuf engine directory.
+
+       * gtk/gtk.symbols: Add gtk_button_{get,set}_image.
+
+       * modules/engines/pixbuf/pixbuf-render.c: Replace usage of deprecated
+       functions.
+
+       * modules/engines/pixbuf/pixbuf-draw.c: undef GDK_DISABLE_DEPRECATED
+       for gdk_draw_string (ick).
+
 2004-11-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 086ebfeb33019e7e8c4573798bbbe5d2cfca8b51..83248c621a3885a9cf3bf9db560b21058448671f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Mon Nov 15 17:17:17 2004  Manish Singh  <yosh@gimp.org>
+
+       * configure.in: Output Makefile for the pixbuf engine directory.
+
+       * gtk/gtk.symbols: Add gtk_button_{get,set}_image.
+
+       * modules/engines/pixbuf/pixbuf-render.c: Replace usage of deprecated
+       functions.
+
+       * modules/engines/pixbuf/pixbuf-draw.c: undef GDK_DISABLE_DEPRECATED
+       for gdk_draw_string (ick).
+
 2004-11-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkbutton.[hc]: Add a GtkButton::image property with setter 

diff --git a/configure.in b/configure.in
index f3cc063a3a2f142f3e9d83100e63affe8cdfa5ee..9d82b8490f69dc431a37d674dada53fe86bf1b0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1673,6 +1673,7 @@ gtk/xdgmime/Makefile
 modules/Makefile
 modules/input/Makefile
 modules/engines/Makefile
+modules/engines/pixbuf/Makefile
 modules/engines/ms-windows/Makefile
 modules/engines/ms-windows/Theme/Makefile
 modules/engines/ms-windows/Theme/gtk-2.0/Makefile

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 94c8e61aa2d29eb7ee8f6d582a32e75746bf5231..66145ad9eaae78fde144e216e73347ea0b152ab2 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -196,6 +196,7 @@ gtk_button_clicked
 gtk_button_enter
 gtk_button_get_alignment
 gtk_button_get_focus_on_click
+gtk_button_get_image
 gtk_button_get_label
 gtk_button_get_relief
 gtk_button_get_type
@@ -210,6 +211,7 @@ gtk_button_pressed
 gtk_button_released
 gtk_button_set_alignment
 gtk_button_set_focus_on_click
+gtk_button_set_image
 gtk_button_set_label
 gtk_button_set_relief
 gtk_button_set_use_stock

diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index cababbe38aa6b0f0b69bbbeb05f0679da33b6f24..8b220da0a464a918dc8068986bab622cbaee3640 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -23,6 +23,8 @@
 #include <math.h>
 #include <string.h>
 
+#undef GDK_DISABLE_DEPRECATED
+
 #include "pixbuf.h"
 #include "pixbuf-rc-style.h"
 #include "pixbuf-style.h"

diff --git a/modules/engines/pixbuf/pixbuf-render.c b/modules/engines/pixbuf/pixbuf-render.c
index 08baf939b4d88b70e382f35ad326b78f5f3c02ca..03ec06083407d733926e97210c9571a6f8171a5b 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-render.c
+++ b/modules/engines/pixbuf/pixbuf-render.c
@@ -424,13 +424,12 @@ pixbuf_render (GdkPixbuf    *src,
                                         128);
     }
 
-  gdk_pixbuf_render_to_drawable_alpha (tmp_pixbuf, window,
-                                      x_offset, y_offset,
-                                      rect.x, rect.y,
-                                      rect.width, rect.height,
-                                      GDK_PIXBUF_ALPHA_FULL, 128,
-                                      GDK_RGB_DITHER_NORMAL,
-                                      0, 0);
+  gdk_draw_pixbuf (window, NULL, tmp_pixbuf,
+                  x_offset, y_offset,
+                  rect.x, rect.y,
+                  rect.width, rect.height,
+                  GDK_RGB_DITHER_NORMAL,
+                  0, 0);
   g_object_unref (tmp_pixbuf);
 }
 
@@ -778,13 +777,13 @@ theme_pixbuf_render (ThemePixbuf  *theme_pb,
                                       pixbuf_height,
                                       -1);
          tmp_gc = gdk_gc_new (tmp_pixmap);
-         gdk_pixbuf_render_to_drawable (pixbuf, tmp_pixmap, tmp_gc,
-                                        0, 0, 
-                                        0, 0,
-                                        pixbuf_width, pixbuf_height,
-                                        GDK_RGB_DITHER_NORMAL,
-                                        0, 0);
-         gdk_gc_unref (tmp_gc);
+         gdk_draw_pixbuf (tmp_pixmap, tmp_gc, pixbuf,
+                          0, 0, 
+                          0, 0,
+                          pixbuf_width, pixbuf_height,
+                          GDK_RGB_DITHER_NORMAL,
+                          0, 0);
+         g_object_unref (tmp_gc);
 
          gc_values.fill = GDK_TILED;
          gc_values.tile = tmp_pixmap;
@@ -796,7 +795,7 @@ theme_pixbuf_render (ThemePixbuf  *theme_pb,
          else
            gdk_draw_rectangle (window, tmp_gc, TRUE, x, y, width, height);
          
-         gdk_gc_unref (tmp_gc);
+         g_object_unref (tmp_gc);
          g_object_unref (tmp_pixmap);
        }
     }